From: martin rudalics <rudalics@gmx.at>
Date: Sat, 27 Aug 2011 08:38:33 +0000 (+0200)
Subject: Fix bug in display-buffer-reuse-window (Bug#9381).
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2456
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a8dc39f266575ca3fe276b15e58e9f05fda44160;p=emacs.git

Fix bug in display-buffer-reuse-window (Bug#9381).

* window.el (display-buffer-reuse-window): Fix case where
selected window was reused with non-nil OTHER-WINDOW argument.
(Bug#9381)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27fd154ac26..71dbcc87805 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-27  Martin Rudalics  <rudalics@gmx.at>
+
+	* window.el (display-buffer-reuse-window): Fix case where
+	selected window was reused with non-nil OTHER-WINDOW argument.
+	(Bug#9381)
+
 2011-08-27  Deniz Dogan  <deniz@dogan.se>
 
 	* net/rcirc.el (rcirc-check-auth-status): Adding support for
diff --git a/lisp/window.el b/lisp/window.el
index e68af18ab8e..651e78bb419 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4761,7 +4761,9 @@ BUFFER, nil if none was found."
 		   (or (memq (window-parameter window 'window-side)
 			     '(nil none))
 		       (eq window-buffer buffer))
-		   (or (not method-window)
+		   (or (and (not method-window)
+			    (or (not other-window)
+				(not (eq window (selected-window)))))
 		       (and (eq method-window 'same)
 			    (not other-window)
 			    (eq window (selected-window)))